Remove todo comments and include minor changes. Component ready for release!