development: Minor updates