small progress
more minor bits