cleanup
add keywords
0.1.18