Fixing some stuff in guidelines as well as update.