Fixes #62 and a Few Forum Suggestions