fixed some little issues and changed some colors