hmmmm

whats this
Revert "Revert "Bug Fixes""

This reverts commit 067294a32611dca77e20e77c490a35c1f97e88c5.