Master

Fix head model bug + some fixes to Lgro's commit.