bug fixes and removals