+ Fixing up some minor bugs