Added aditional comment blocks and formattings