Few tiny changes (Nanotime, woo!)