Reworked some, fixed others, added one