enhanced some things...