Bug Fixes

It now works! Yay!