Updated and Fixed minor issues of crash