fixes for various bits
0.3.1 with bug fix