Small touchups, fix forms