Add better defaults and documentation