Ran Raptor in Debug, seen issues, fixed issues.
Merge pull request #2 from Simon311/master

Ran Raptor in Debug, seen issues, fixed issues.