some small fixes... it still does not compile