Updates to various bits of info
Remove some debugging