add comment, refact shipping