new types and fixed issues in output