addressing review comments, compilation with hadoop-1 and stuff