Magic bug fixes pull request

yay magic