some updates. more todo tomorrow