added support for a few more uniform types. took out some console crap