Random fixes

this has changed