Updates, cleanups, bump to 1.6