And some more improvements according to PR