many improvements. still a brain dump.