Sync local repository changes
Added TODO's
Fixed/Changed some stuff.