work updates & fixes