Added scaling support for static objects

Also tidied up few areas; and removed normals update once again