improving timing, fixes #48 and fixes #43