improved print styles, moved some things around