Version 1.6.1 update with minor fixes