Updated to latest from MEAN and a few other changes