Fix formatting and minor misc details