added more overrides, updated a bit of the style