major cleanup. fixed several files. removed old files.