Couple bug fixes, and adding oh-my-zsh