[WIP] TODO for issue #6
minor fix to form generation