Added type to untyped constant array, and added variables which actually fix compiling. I really should test changes before I commit them.