More features

Fixed the Keyword stuff. Let me know if there's anything wrong :)