Work on achievements and database fixes and improvements