update type and fix location