Much small changes + added error class