looking through code and adding general comments