fixing a few items and cleanup