Fixed a couple of bugs g
Fixed up forms