4.0 RC2

lots and lots of changes and additions