first testings. bugfixes added