Cleanup for publication
Several updates