Minor bugfixes, small reviews