diff --git a/assignments/act1-finding-accessibility.md b/assignments/act1-finding-accessibility.md
index a456975e2b3e9d2377f63ab66fc127f2a53d5aa2..c9ecc06c1e9889118adf68b64a98acdf29a8e527 100644
--- a/assignments/act1-finding-accessibility.md
+++ b/assignments/act1-finding-accessibility.md
@@ -3,7 +3,7 @@ layout: assignment
 published: true
 
 title: AT around us
-code: act1
+code: hw0
 
 assigned: March 31, 2021
 due:
@@ -75,13 +75,18 @@ You will create accessible slides with links to the video or blogs you find, pic
 
 ### Grading 
 
-This homework will be approval graded, meaning that you will fill out a brief rubric about this homework and a classmate and/or instructor will verify it. Learning goals for this homework are:
+This homework will be approval graded, meaning that you will fill out a brief rubric about this homework and a classmate and/or instructor will verify it. 
 
-1. To improve your knowledge of the range of AT that is avialable for improving access to the world
-2. To improve your knowledge of the range of AT that is available for improving access to computers
-3. To practice (and improve your comfort with) differentiating between *infrastructure* problems/solutions and *individuals* access
-4. To experience using AT
-5. To think about the usability of AT
-6. To familiarize yourself with and learn from first-person accounts of disability and AT use 
-7. To learn how to make an accessible slide 
+**Five** points will be assigned to the peer grade, consisting of
+- Student described how this technology solves an accessibility problem. 
+- Student described how the technology suits the needs of its intended users.
+- The presentation surfaces a limitation or frustration that the intended users have with the technology chosen.
+- The perspective shared in this presentation is informed by first-person accounts of the technology's users.
 
+**Four** points will be assigned to the self assessment, consisting of
+- I learned how this technology solves an accessibility problem.
+- I was able to convey a limitation or frustration that the intended users have with the technology chosen.
+- My presentation is informed by first-person accounts of the technology's users.
+- I provided image descriptions in the presentation
+
+**One** point will be assigned by the instructors based on completeness
diff --git a/assignments/hw1-nvda.md b/assignments/hw1-nvda.md
index c8f760daf95738f0efaae7950105840bd9fc96ce..616230eb2c3242520539dd739a4dad0278a06b06 100644
--- a/assignments/hw1-nvda.md
+++ b/assignments/hw1-nvda.md
@@ -38,6 +38,8 @@ You can find the full list of issues below. Once you decide the github issue tha
 
 # NVDA Issues
 
+You will join a [group of your choice on Canvas](https://canvas.uw.edu/courses/1465814/groups#tab-122183) based on which issue you wish to address. You may start working *individually* on a solution right away, but the group is there to share ideas and for phase 1's handin.
+
 1. [NVDA announces "Article" before every article while browsing the articles via quick keys #11103](https://github.com/nvaccess/nvda/issues/11103)
 2. [Failing the checkPot step should be more obvious. #10928](https://github.com/nvaccess/nvda/issues/10928)
 3. [Report status of screen curtain at startup when "Play a sound when toggling screen curtain" is disabled. · Issue #10692](https://github.com/nvaccess/nvda/issues/10692) (bug affecting screen reader announcement of screen curtain status. Picked up by a developer, but abandoned). 
@@ -48,11 +50,8 @@ You can find the full list of issues below. Once you decide the github issue tha
 8. [Grid cells with focusable controls get read twice #10096](https://github.com/nvaccess/nvda/issues/10096) (abandoned, and potentially a spec conformance but annoying behavior)
 9. [Table navigation doesn't respect colspan · Issue #7278](https://github.com/nvaccess/nvda/issues/7278)
 
-
 ## Phase 1: Jointly prepare solution approach submission for NVDA (only for us)
-You will work as a group to prepare a sollution approach, proposing one or multiple ways of fixing a bug to improve the user experience for NVDA users. Please keep in mind that you should consider the oppinions expressed by the NVDA user community through comments on the github issue of your choosing. You will not submit these to NVDA; you will submit these proposals as a group to [this Canvas Assignment](https://canvas.uw.edu/courses/1465814/assignments/6267341) for review by the course staff. You will start communicating with NVDA after receiving approval from the staff.
-
-
+You will work as a group to prepare a sollution approach, proposing one or multiple ways of fixing a bug to improve the user experience for NVDA users. Please keep in mind that you should consider the oppinions expressed by the NVDA user community through comments on the github issue of your choosing. You will not submit these to NVDA; you will submit these proposals as a group to [this Canvas Assignment](https://canvas.uw.edu/courses/1465814/assignments/6267341) for review by the course staff. You may start communicating with NVDA after receiving approval from the staff.
 
 ## Phase 2: the solution
 
@@ -62,10 +61,17 @@ This will be a ten minute presentation re-capping your first-phase, and:
   - If you are unable to fix the issue, why? E.g. disagreement within the community, etc.
 
 You will need to submit accessible slides to [this canvas assignment](https://canvas.uw.edu/courses/1465814/assignments/6148838). Please [make your presentations accessible, and present accessibly](http://www.sigaccess.org/welcome-to-sigaccess/resources/accessible-presentation-guide/) (here is [a short video](https://www.youtube.com/watch?v=L9TxhGv91kc) that provides some guidance)
+
 ## NVDA setup and other pre-requisites
 
 You will need a Windows computer running Windows 10 and python 3.7 (32-bit) to install NVDA. If you do not have a Windows machine, please reach out to us as soon as possible. We have a limited number of machines that can be accessed remotely. The instructions to build NVDA are in the [NVDA github repository readme](https://github.com/nvaccess/nvda). Please also be sure to [read the contributing guide](https://github.com/nvaccess/nvda/wiki/Contributing).
 
 ## Grading
 
-TBD
+This is a 10 point assignment. 
+
+Grades will be based on your peer feedback (5 points).
+
+Your self assessment (4 points)
+
+And your group solution summary (1 point).
diff --git a/assignments/index.md b/assignments/index.md
index 88b1765af54ae0150a725e13a4ff11a265780146..680fe5031f46899ed522979e2f415b67f88e940c 100644
--- a/assignments/index.md
+++ b/assignments/index.md
@@ -17,8 +17,8 @@ questions or run into issue, please contact the course staff.
 
 | Exercise |  Peer Eval        | Reflection |
 |-------------------------------------------------------------|--------|--------|---------|
-| [HW0: Learning goals]({{site.baseurl}}/assignments/hw0-learninggoals.html)               |   |  |  
-| [Activity 1: AT around us]({{site.baseurl}}/assignments/act1-finding-accessibility.html)               |   |  |  
+| [Activity 1: Learning goals]({{site.baseurl}}/assignments/hw0-learninggoals.html)               |   |  |  
+| [HW0: AT around us]({{site.baseurl}}/assignments/act1-finding-accessibility.html)               |   |  |  
 | [HW1: Improve a screen reader]({{site.baseurl}}/assignments/hw1-nvda.html)               |   |  | 
 | Activity2: Make a website usable with switch access -- spec coming soon.               |   |  |
 | [Activity3: Describe pictures and videos]({{site.baseurl}}/assignments/act3-describing-video-image.html)               |   |  |