Probably just big fixes

I've still got my fingers crossed for the negotiations list to get added at some point!