Code and other updates