Fixes, additions, etc. Ready for release