Formatted a bit more, and fixed some old formatting.. still needs work