Follow Up 7dfccce9a9bf007ea35d1f93bc366a83636be4d4

~fixed some minor errors