Removed some debug stuff
Same table structure also for numbers