BF: Misc fix's, improvements

Also added a TODO.txt