added some formatting stuff, thought really hard about certain things