ton of bugfixes, added subv