updates to fix a few coding issues