code formatting, and more to-do's