more clean-up, added shadow