New features

merging a bunch of work for RC2