Yay! Bugs fixed!