some bug fixes plus shipping days