Added interface for user-interaction, some bugfixes regarding indexing