Fixed an issue with removing, and several other minor issues.