MORE bug fixes lol