Fixing many bugs and adding new policy for declaration words
probability. Some of them are more important than the others.
Signed-off-by: Tihomir Gvero <tihomir.gvero@gmail.com>