Various changes, also fixing stuff