Slight refactoring.
Readme update.
Linux compilation fix hopefully.