fixed one key  issues (still have some)