clean up error
name
patches from rt
bump version
merge