Corrected comments, cleanup, TAKE outline moved