Add todos and cleanup docs