send some fixes
Merge pull request #530 from ahilles107/mixfixes

send some fixes