Made annotations more interesting & fixed timestamp bug