added comments; advert views; refactored