fixed and added stuff