fixed some nanosecond issues