resolved some minor issue