diff --git a/developer-guide/getting-started/moonstone-app-tutorial.md b/developer-guide/getting-started/moonstone-app-tutorial.md
index a4706da..014de44 100644
--- a/developer-guide/getting-started/moonstone-app-tutorial.md
+++ b/developer-guide/getting-started/moonstone-app-tutorial.md
@@ -34,13 +34,12 @@ obtaining and installing these tools, along with some suggested choices (where
 appropriate).  If you are already familiar with the tools, feel free to install
 them on your own and move on to step 2.
 
-## 2. Install a moonstone app template
+## 2. Create new project with moonstone app template
 
-The `enyo-dev` tool does not include a Moonstone app template but makes it easy to add
-custom templates. We'll start by adding a Moonstone template and then use the template
-to create our base app.
-
-TODO: Complete this
+```
+    enyo init -t moonstone-app moonstone-project
+		cd moonstone-project
+```
 
 ## 3. Set up main view
 
@@ -568,7 +567,7 @@ the value of `searchText` is altered.
 Finally, we'll override the collection's `fetch()` function to provide more
 information to the source about how to retrieve this specific information.
 Along with the search text, the [Flickr photos search
-API](https://www.com/services/api/photos.search.html) requires us
+API](https://www.flickr.com/services/api/flickr.photos.search.html) requires us
 to pass a `method` query string parameter indicating that we want to search
 photos.  There are a number of optional parameters we could specify as well; for
 this sample, we'll specify a `sort` value (so that we get interesting photos),
@@ -634,7 +633,7 @@ our `SearchCollection`, we should get result data loaded into the
 collection.  But there is one final step.
 
 If we look at a sample of the [data
-returned](https://api.com/services/rest/?method=photos.search&sort=interestingness-desc&per_page=50&text=San%20Francisco&api_key=2a21b46e58d207e4888e1ece0cb149a5&format=json&jsoncallback=enyo_jsonp_callback_0)
+returned](https://api.flickr.com/services/rest/?method=flickr.photos.search&sort=interestingness-desc&per_page=50&text=San%20Francisco&api_key=2a21b46e58d207e4888e1ece0cb149a5&format=json&jsoncallback=enyo_jsonp_callback_0)
 from a call to the API, we can see that it is not actually an array, which is
 what `enyo/Collection` expects.  The array of photo records is actually nested
 a couple levels down in the object returned: