fixes
Merge pull request #85 from BrandyMint/FM_fixes

fixes