major update

many things not finished