completes main functionalities; adds keywords;
fixes the missing dependencies; fixes reference errors