updated oglplus, and code, to use more functions which make more intuitive sense