touching up params and forms
cleaning up a little