fixed couple small bugs, added some forms