Key Arrays

Added keys to all arrays to make data retrieval easier

Minor bug fixes