minor changes (mainly to the types)