fixing small quirks