Various tweaks
Update dependencies
1.0.1