FUJI: updates/fixes/cleanup