Cleaned Up

Changed Multiplier types to long