some fixes... but it does not work yet