tightened up structure, fixed object removal glitch