Fixes and conventions

@purplefox could you review in particular the list/map/set impl ?