cleanups and parse numbers/bools
take 2