corners now merge color + minor code fixes