bug fixes(yeeeeeeeees again)