Some improvements

Some more improvements. See git log.