Final commit, last tweaks.