rewrite history
fixed bugs