Fixing stuff, back shortly