Removed the static var, and fixed couple of links