Fix46/achievements

Fixes #45 
Fixes #46 
Fixes #47 

Still need to cleanup a bit