Small improvements

The commit messages are self-explanatory. In case you have questions or comments I will answer them gladly.