Uploaded halvors fixes