Updated to 1.4!

Many bug fixes but still a lot to fix.