Fixed interwoven nulls problem and reformatted everything
Reformatted error messages
Did some minor corrections
Made minor fixes
Merge remote-tracking branch 'origin/master' into testing