change stuff + add index script
merge + fix