Fix issue with multiple imports
Fix issue with negative numbers.
Minor issues where variables need to be changed.