Add final modifiers, minor changes