finally fixed some minor thing that has been bugging me...