changed comments, function names/parameters