Finish removal of atoi and atof. Add additional variable types to test grammar. Add comments