Style update, bug fixes and more