limit reached check fixed and more minor finish button fixes