Latest updates

Too many to list... Lots of clean up