Remove numbers and some miscellaneous tweaks