Secure update. Also comments pagination was added.