Refined capacity calculations and added max Scan amount
0.0.22