Added try / except blocks to main entry-point to ensure more stable operations
Updated TODO list after completing a few more tasks