Comments improvements, readme fix