fixed default settings and some formatting