Remove redundant type parameters
Added carpet + minor fixes
Added double_plant