Noticed that 1000 is being used rather than 1024 - I don't support this (if other users want this si notation then its a configurable feature request).

Review all the code and fix where appropriate.