Fixed and added achievements