FIX: structure, minor improvements
MERGE