fixed some little issues