Fixes and improvements. Found a header file that hadn't been gone through yet.