improved add/remove units

still work to be done.