fix Makefile
fix discussion (add future experiment)
final paper preparation