Some aures and general tweaking