fixed key issues (still have some)