more refactor

adding:
stop trailer
work with comment