#16 Few minor changes,