got less working
lots of stuff added
some fixes
more fixes