added some files + improvements