Improvements

Finally dug up the root of issues with cascading defaults