bug fixes plus extending folder entry test