some small fixes and improvements
3.02