Fix some bits and pieces, tests still in progress
Bump up version