More features

Fixed the Keyword stuff. Let me know if there's anything wrong :)
Elliott: when I try to remove the fetch_row I get a strange result. I'll show you in databases or algorithms but I think since the result of this query should only ever be one tuple, it isn't wrong to have the fetch_row