changed even more stuff!