further tread developement and minor bugfixes