fix void crash
forms update to joda object and renames for the forms