Added in Clock Rate for title

Also a few refactorings