edited more stuff