Fix minor bugs and add Reachability