some fixes, still does not compile