Logic cleanup
1.0.7 released