Various changes per #11