More fixes/changes

View email for more info