some tidying up + prep for windows