misc refactoring & cleanup; addition of new item; listing of existing items"