add tracking; clean up white space