more updates

almost there?