Cleaned up a few things, tested further, made setting keys more seamless