micro fixes (I still do not really understand what i am doing)