Added Buggy Timer and some Formatting