changed hand scaling, added wave to continue, cleanup
changed marginFraction to be a fraction
modified image loading to match new functions