Streamlined keys and finalized implementation of creation and deletion of unique keys. Time to start thinking about automated tests ... :D