some clean up

removed duplicate functions, removed out of date comments
republished swf

bluh