Whoops, forgot to remove that, also tweaks