lib updates
some fixes, unify list-template