Tweaked ingot code to better allow for 64 ingots in a block as well as code cleanup