Small tweak to handle an error on whereami
Another tweak to whereami
Shell history. Some quick refactoring