-bug fixes yay