cleanup and adding a few new things.