more bugfixes and begin adding remove fn for firebase..