Change delta to be handled as milliseconds... + minor tweaks.