much of updates
fixed some formatting