made fixes where wrong keys were being called