fixed a few quirks