Limits and some fixes