The bug slaying update, code cleanup to come later. Also smeltery