okyeron lotsa fixes / update arc