Fixed TODOs , Class Action deleted, and some adds