little patching and AStyling