Few minor updates and removal of completed @todos