Removed javascript psuedo protocol calls

Other bug fixes as well