Various improvements, add timer platform