Minor commits made. More to be added on firebase soon