Final updates and minor fixes for better presentation