sort
removed obsolete runner.cpp
fixed expression/function parsing