Overview + minor changes