cleanup and some fixes
added tagging
deleted obsolete file and added whitespace