BUG: small error in energy printout; cleanup printout generally; reinstate orthogonalization