Adjustments to object placement in Shock 
Some code cleanup