new files and last changes (fix for touch etc.)