Ok, got everything cleaned up  a little for keys and such.