Made timeline display selected disclaimer
Cleaned up last commit goof
merge with master