changed string keys
updated lib