A few more fixes to centering and type