some cleanup
working solution for flush onPublish, onUpdate, onTrash, onUntrash :-) close #1 -> v1.0?