Various changes

no site changes log this time, too lazy to do so at the moment - will add a change log later