Ricks code gecommit plus enkele kleine fixjes in index