Fixed #5 and various fun things.