BUG FIXES WOO

Finally!