whampson Style fixes