Edited more stuff