Adjust type, add project, other tweaks.