logging, small bug fixes
2.1.2