(yay progress) Start fixing object deletion, and misc stuff