Adjusted limits logic; Added logging around limits to troubleshoot bug;