syntax fix
comment out old stuff
re-order items according to their popularity
wording updates