move history bug fixes for inital commit