#3 fix + some other changes