Form updates, fixed off-by-one error in import