almost done with remove / minor bug fixes