fixed up Issues