props.js cleanup and fixes