Adding in final touches

Gotta fix up some errors