fixed some minor issue