slight bug fixes on my end