Updated, commented files