1.2.2 revisions

cleaned up edges, might need more fixing