More features

Fixed the Keyword stuff. Let me know if there's anything wrong :)
I think you want to remove this fetch_row too.