+ minor fixes, still not runnable