lots of work
removed some junk