Edited the error message in Haar2d to be more concise; fixed typo in comments.