bug squashing, updated forms