Prepared for jarring, Fixed couple of bugs, Processed some feedback