various changes to match 1.3.x styling