Most major issues fixed. Averaging doesn't really work all too well yet