Adding last devel modifications

Added modifications (including issues fixing)