some changes to attributes and firebase location