Spaaaace

Fixed spacing, also readded the autopop helper