* general reorganization of processes flow - fixes