some updates.  probably won't compile