added multiple fixes