fixed weird quirks