version 2.0

fixed various bugs and added more TODO with certain function logic and
misc. things