Some minor updates
oh yeah un-needed imports.
updated bug handling
Merge pull request #34 from carharttjimmy/master

more bug handling support