Improved __init__, documentation