Final commit, last tweaks