Updated SmoothingAndStep and Tuple. Should calculate properly now and
fixed a few errors and crash-situations