Some improvments

Another bulk of changes for review