Updating to latest version

Not entirely sure what changed in 6.19... if anyone remembers or cares to look at the commits let me know!