Minor additions and updates

This PR should probably be added when we are close to releasing a beta 1