Fixed entity listing code, about to start on listing and parsing now