i have no idea what i was doing here lately...
some fixes again