cleaning some stuf up and commenting other stuff