Fix small bugs, history is coming