bug fixes and feature additions