more formating and changes to various forms