#4 #5 #7 fixed, minor enchancements