udpated habitat, it'll now read newlines and comments