Fixed #37 and sorta fixed #22 (IT'S A TRAP.)