Add comments and min sizes.