RC2

Some bug fixes here and there