some cleanup, started swf-stuff