Fixed a few minor bugs and added support for an implicit final argument