Fixing most of the issues described in #18

This pull request together with the latest [zatanna](https://github.com/dkundel/zatanna) update fixes all points discussed in #18 except of the first point.