fixing merge errors
fixing yet more merge errors
added forms page