Manly bugfixes, code cleaning
Major bug remains in Number.add(Number, Number) 
So big it shouldn't be too hard to fix