Comments and renames
More comments... crop output