Small updates. Will continue to push on this branch over the next weeks.