Updates and better documentation