Better presentation & minor fixes