bug fixes and performance improvments lol