slight updates (incomplete)