Bug fixes, feature additions