Big update

lots of changes