Tidied up some defs and fixed bleeding on radiation