Switched to default dict, smallbugfixes