a lot of minor changes/quick fixes