more work on #45, need to get the pson conversion down
fixing some spacing issues