fixed nits, needs to be squashed