Few small updates

Changed error messages to be more insightful. Some logical tests now
compare numbers => give right answers.