A bunch of changes & minor improvements I did over the weekend. Have fun\!