A few minor changes, nothing significant. Still fairly buggy...