Improved source
Added information display support
Updated todos