fixes. working v 0.1