Added extra start values to remove missing values
Small bug fixes