more bug fixes(lol)