Some minor changes @author