fix rvalue reference bugs in covert
clean up syntax
whitespace change?