fixed some quirks