somes fixes
fixed indices