Added a bit more correctness and some preprocessor goodness

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>