Style updates and bug fixes