made some small fixes, still doesn't build... Wait for it!