Yay bug fixes :D