minor formatting & other fixes