Fixed positioning and removal/disposal of shadows

See code comments