fixing some things
Merge branch 'master' into micflan.com