fix constants
add binstubs