Troubleshoot, walkthrough with Matt, misc. fixes