fixed little issues mentioned in post comment