Noted my (minor) changes from the original repo