BugSmashv2

We fixed things