less buggy!

- More reliable but still suffering from a couple critical problems.
Merge pull request #1 from hugobomber/hopethisworks

less buggy!