mass reorganisation and some new handlers