Fixing minor issues, rolling back on question 2 solution