Improvements and bug fixes after first round of prototype testing