Style updates and other misc