updated for new enums, fix all dependencies to specific versions