some incomplete fixes