fixes and improvements
lots of stuff