A few changes to account for size inaccuracies; needs to be re-worked to allow for more configuration.