more accurate timeout;
tuned whitespace;