Somes architectures modifications for consistency, ameliorations and bugfixes