Efficency improvements, more dynamic methods, added my name everywhere