Fixed bug spotted by madesyp@madesyp.com
Added more information constants, commented out for now.