Extended evaluation metrics
Added one possible direction for future work
A few minor fixes