Fixes and addition of Vec4