Fix a few bug from initial release
switch from seconds to milliseconds