Minor tweaks, moved some stuff around