Fixed several bugs, including serious Timer typo