Fixed more of Max's suggestions