Small features

The pull requests add some small features, mainly for convenience