Form code formating improvements. Fixed up some missing concepts that have since become available.