Changed default functions. Cleaned up NAMESPACE/DESCRIPTION
opti