Minor updates, this is still only a rough experiment