Fixed bugs in ekonomic part