Added rules and fixed a few bugs with regards to multiple forms