bug fixes
Better error stuff
Better error stuff
Better error stuff