Major update

pre-beta release)