some fixes #2

it doesnt work yet