Fix serveral possible bugs, update specs for Probe