misc organization improvements