some progress on form, mostly formatting