Added x86 build configuration

There are some other minor edits mixed in there. I wouldn't mind if they made their way into your repo ;D