rye1994 update 2

He fixed oversights on his end. Rolling in.