fixes and missing viewset