01.10.14 fixed some bugs