nicer styling, fix timing edge cases