added most remaining tokens
fixing package name