Some minor tweaks and changes. Thanks again, @harm10.