More quirk cleanup & fixing, hopefully functional as intended