bunches of bugfixes, alpha build