Minor updates: printing style, etc.