Fixed #65, Fixed #69, And a whole lot more.