Bug Fixes

+ Clears errors on exit
+ rename broken variables