Updated comments and stuff to reflect v2.0
Updated Ideas