All is done! Quality fixes