Add song feature + final clean up