The New Sheriff: 1.6.9

Minor bug fixes and optimized performance