Added null checks to 'geom buffer'
Added a check for '.' in uniform names
Polished 'material'