added privacy option and a few quick fixes