fixed typos, restructered and fixed big listings