Oops, fixed some quirks.