improve docs, remove deprecation warnings