Clean up and bug fixes
Updated samples
Updated TODO