added forms, some minor changes