Merge "Changing default limits, clarify flags, fix bug." into qt-dev