clean up and fixing &
0.2.2