Worked out a few quirks