fix names; import in __init__
fix dictionary name
fix single top
Merge pull request #1 from cerba/fixes

Fixes