Seems like I've been able to make the same fixes as in the vagrant branch but without the stuttering.