Fixed double slash (//) problem in a few places