minor fixes, and removals