fixing, fixing, fixing stuff, waiting for the puff :)