Added timing script, fixed json output bug