- fixes & stuff