adding last changes from skeletos repo