fix comments
better error message