Made some revisions, started on geometric factors