Some reset fixes.  Looking nice.