3.6.1

Bug Fixes

 * Overall bug fixes and optimizations.