[CHANGE] litte bugfixes;