moar bug fixes and song changes