Expanded time options, improved tags, updated readme