Updates

More list / dict comprehensions added