Adjusted keys and fixed some stuff