add and remove objects immediately, remove junk from director
Fix events