added # keys to form, cleanup comments