added object add + remove, cleaned up stuff