done + updated some comments