updated docs, cleaned up code in user