add in terminal shots; clean up organization