Added TODO, minor updates to objects.py