More headache inducing changes

* Too many things to comment