Updated; fixed hug(); final additions; tested