remove compilation warnings
fix modified state for songs
cleanups