Added Errors class, tweaked things