changed a lot
added stuff