More code & docs updates