fixing compiler warnings, timeline improvement