fixes + removeObject (unfinished)