General commits: form fixes and back-end call setups