Updated to v1.7, includes 1.6. Tied up lose ends