Nalanda rct2 into rct3

Some yummy fixes in here.