minor updates, readying for development branch