Fix more functionality
0.0.6