Updated script with more features and better censoring

Added upload and time-stamp features.