BUG FIXES lol