fixed naming, more comments