Fixed some stuff

v1.4