Made some corrections, update documentation, improve class...