More dev branch updates