Fixing the comments + improving error output