more todo's added
alot of changes.