Fixed numerical constant regex and added some options and option values