some fixes.
Merge branch 'master' of github.com:ssxenon01/feedback