Cleaned things up and add osxkeychain helper.