Fix Format errors and Missed Info