use const string& in preference to const char* in arguments
prettify code
initial support for EDF annotations