songsto: SP integrated, cleanup & mods