Minor Fixes

Still need to get the delete function working.