Cleanup, name changes
Added background music!