added new stuff and finished forms