small updates. still incomplete