fixed populating and removing bugs :D