Fixed remarks and added po for shipping