#64 #65 #66 Pushing fixes/enhancements upstream