fixes and improvements
6 files changed