add directories, fix style and color bugs