Cleanup

Doc clean up and ensure that tests, demo work out the box