cleaned up entries a bit
yanglee52