some small updated +  bugfixes