- Fix category goals not working properly
- General bug fixes and improvements