F/minor improvements