Shave & Stuff: Maintenance update

bug fixes