Updates to rev 1
clean up