Added javadoc comments and fixed the trash functionality to have untrash/recovery as well :)