Formating and some small updates