Added a few things here and there. About to get rid of all the extra boilerplate code.