Lots of fixes (more to come a bit later)

View email for more info