Slots imp - minor momdifications