fixed wrong partial locations and wrong current_user? implementation