Clean up and bug squash