Improve documentation, add more transitions