Added some extra sanity checks and updated grammar