minor fixes and improves. #82