Some updates. Still a work in progress.