code / comment fixes