small changes mostly in regards to forms