Code walkthrough/fixes