Add errors and format a bit :P