small fixes + changed comments