Mainly refactory stuff, but contains an one liner fix that is hitting now.