further bug fixes but still some constraint issues
removed lvalue/rvalue dependent type annotation