added forms, tweaked controllers