More work
cleanup
Github url fix