added more stuff
unambiguated some words