just cleaned up some of the branching logic
0.1.1