Major update w/ fixes and such.