Several tweaks, removed parseBool dependency