Introduced built-in constants and some extra error checking