bug fixes,ready to grab entries