Updated to 1.4. Various changes