minor updates before REST API