shame, other style fixes