Fixed TOS formatting, added more forms