more bug fixes for new features