Fixed limit checking and documentation of timeout