Updated to 1.6.1
Numberous bug fixes and tweaks