WIP
Fixed extra tab bug
Fixed missing zeros