Added milliseconds to all timestamps
Some bug fixes