sweet caroline, bop bop bop!

few changes
fix error