misc cleanup, adding comments