Cleanup and some Achievement updates