(master) updates & notes