Adds Achievement Controller

Fixes minor bugs