comments added and search function working as it should