Some tweaks and fixes
Added Reachability