updates minor; adds keywords; #17
test; adds test cases; #17
fixes #17; remove old lines