More consistencising

With errors and stuff