Fix some bugs. Tonight, we rest. :smile: