cleanup and added wiki --> going to new branch