More formating and decimal places fixes