bugfixes, added functionality for dev2,dev3,dev8