added answers, cleaning up