Now it builds previous commit and some bugs removed...