I fixed few things
Merge branch 'rfrost'
almost done