Fixed weird consistancy bugs
Fixing little compile problems
Merge pull request #4 from robinvierich/rich

Rich