new fetures and bugfix