A couple of small changes
More hacking