small fixes; not compiling yet