More stuff

I heard that ZT liked the '?' commit so expect more of those ;)

Gleason