few small fixes, tnx