Big update

more to come