Added a few things, merged with Tyler's stuff.