Basic windows build fix
leading zeros fix
WIP