Final commit. More improvements to come.