Cleaned up code, 2 new classes. New sounds added