used call for toggle/remove/add, cleaned up a lot of stuff