functional fixes