some fixes..
.