minor changes, preparing for REST branch