big update to style etc