a bunch of small changes to the forms