added more features
merge seth-version-2 into dyna-shizzle, fix conflicts