changes to some files and fixes
Merge pull request #1 from Showmee/show

changes to some files and fixes