trying to fix some minor coding issues