lol more bug fixes