fixed some formatting, still needs to be completed