Make better matching between options types in options.h and the rest of the code. Most changes are from gint to gboolean pseudo type and between gint / guint.