Fixed all the above. Also did an attempt at making the lists more flexible.