fixes and feature additions