some renaming and fixes
add example