Added to-do and improved documentation