Bug fixes + made ready for midterm