walkthrough update and small cleanups