Update: minor improvements