Cleanup, added more tests, and some basic cl functionality for the prj presentation