a lot of fixes and improvements
23 files changed