Merge danmana

Merge in dan mana's changes and update our files