added prompt & bug fixes