Bugfixes for all yay
Tidying up