Figured out final small bugs in js / error-handling / validation